[IA64] Sparse tree cleanup

With this patch we can remove linux-2.6-xen-sparse/arch/ia64/dig/setup.c,
linux-2.6-xen-sparse/include/asm-ia64/machvec.h.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/linux-2.6-xen-sparse/arch/ia64/Makefile b/linux-2.6-xen-sparse/arch/ia64/Makefile
index c68f030772beaf3f4128aa1c40ce155219f98579..399209be32c9927f6ba83adf500a2156d41ef169 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/Makefile
+++ b/linux-2.6-xen-sparse/arch/ia64/Makefile
@@ -64,12 +64,7 @@ core-$(CONFIG_IA64_SGI_SN2)  += arch/ia64/sn/
 core-$(CONFIG_XEN)             += arch/ia64/xen/
 
 drivers-$(CONFIG_PCI)          += arch/ia64/pci/
-ifneq ($(CONFIG_XEN),y)
 drivers-$(CONFIG_IA64_HP_SIM)  += arch/ia64/hp/sim/
-endif
-ifneq ($(CONFIG_IA64_GENERIC),y)
-drivers-$(CONFIG_XEN)          += arch/ia64/hp/sim/
-endif
 drivers-$(CONFIG_IA64_HP_ZX1)  += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/

diff --git a/linux-2.6-xen-sparse/arch/ia64/dig/setup.c b/linux-2.6-xen-sparse/arch/ia64/dig/setup.c
index 93048b2c16177c87af4bcbcd05af70bde323a869..9196b330ff7fa917c0508ca6e5b35578b0bffc86 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/dig/setup.c
+++ b/linux-2.6-xen-sparse/arch/ia64/dig/setup.c
@@ -24,8 +24,6 @@
 #include <asm/machvec.h>
 #include <asm/system.h>
 
-#include <xen/xencons.h>
-
 void __init
 dig_setup (char **cmdline_p)
 {
@@ -69,19 +67,4 @@ dig_setup (char **cmdline_p)
        screen_info.orig_video_mode = 3;        /* XXX fake */
        screen_info.orig_video_isVGA = 1;       /* XXX fake */
        screen_info.orig_video_ega_bx = 3;      /* XXX fake */
-#ifdef CONFIG_XEN
-       if (!is_running_on_xen() || !is_initial_xendomain())
-               return;
-
-       if (xen_start_info->console.dom0.info_size >=
-           sizeof(struct dom0_vga_console_info)) {
-               const struct dom0_vga_console_info *info =
-                       (struct dom0_vga_console_info *)(
-                               (char *)xen_start_info +
-                               xen_start_info->console.dom0.info_off);
-               dom0_init_screen_info(info);
-       }
-       xen_start_info->console.domU.mfn = 0;
-       xen_start_info->console.domU.evtchn = 0;
-#endif
 }

diff --git a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
index fcbe83fe5a5702e21e47b54ec1aad53298ebcb7c..a16c393f75cddee321d5f7798e268d82fba734f5 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
@@ -602,6 +602,9 @@ setup_arch (char **cmdline_p)
                ia64_mca_init();
 
        platform_setup(cmdline_p);
+#ifdef CONFIG_XEN
+       xen_setup();
+#endif
        paging_init();
 #ifdef CONFIG_XEN
        contiguous_bitmap_init(max_pfn);

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
index 509456066ea6447aeb8b5540ebc05121d69e47f6..cb7885dfd3e4b41f9d33bdbdddbf7cd982706850 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
@@ -32,6 +32,7 @@
 #include <asm/hypervisor.h>
 #include <asm/hypercall.h>
 #include <xen/interface/memory.h>
+#include <xen/xencons.h>
 #include <xen/balloon.h>
 
 shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE;
@@ -51,6 +52,24 @@ static int p2m_expose_init(void);
 
 EXPORT_SYMBOL(__hypercall);
 
+void
+xen_setup(void)
+{
+       if (!is_running_on_xen() || !is_initial_xendomain())
+               return;
+
+       if (xen_start_info->console.dom0.info_size >=
+           sizeof(struct dom0_vga_console_info)) {
+               const struct dom0_vga_console_info *info =
+                       (struct dom0_vga_console_info *)(
+                               (char *)xen_start_info +
+                               xen_start_info->console.dom0.info_off);
+               dom0_init_screen_info(info);
+       }
+       xen_start_info->console.domU.mfn = 0;
+       xen_start_info->console.domU.evtchn = 0;
+}
+
 //XXX same as i386, x86_64 contiguous_bitmap_set(), contiguous_bitmap_clear()
 // move those to lib/contiguous_bitmap?
 //XXX discontigmem/sparsemem

diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
index 831ba86ae7d880908454bc33915bc1671a082979..3e2aac31bed55ae5ce7d4bd8920896a6e99b4ae2 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
@@ -36,6 +36,7 @@
 #ifdef CONFIG_XEN
 extern int running_on_xen;
 #define is_running_on_xen()                    (running_on_xen)
+extern void xen_setup(void);
 #else /* CONFIG_XEN */
 # ifdef CONFIG_VMX_GUEST
 #  define is_running_on_xen()                  (1)
@@ -43,6 +44,7 @@ extern int running_on_xen;
 #  define is_running_on_xen()                  (0)
 #  define HYPERVISOR_ioremap(offset, size)     (offset)
 # endif /* CONFIG_VMX_GUEST */
+#define xen_setup()                            do { } while (0)
 #endif /* CONFIG_XEN */
 
 #if defined(CONFIG_XEN) || defined(CONFIG_VMX_GUEST)